From: Konrad Rzeszutek Wilk Date: Mon, 13 Jun 2016 09:28:57 +0000 (-0400) Subject: libxenvchan: Change license of header from Lesser GPL v2.1 to BSD X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~968 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=937324f032f4f77866e80e39de0d697fa5131df1;p=xen.git libxenvchan: Change license of header from Lesser GPL v2.1 to BSD As the xen/COPYING file says: "A few files are licensed under both GPL and a weaker BSD-style license. This includes all files within the subdirectory include/public, as described in include/public/COPYING. All such files include the non-GPL license text as a source-code comment. Although the license text refers generically to "the software", the non-GPL license applies *only* to those source files that explicitly include the non-GPL license text." The libxenvchan.h is under xen/include/public/io directory and the xen/include/public/COPYING says: "XEN NOTICE ========== This copyright applies to all files within this subdirectory and its subdirectories: include/public/*.h include/public/hvm/*.h include/public/io/*.h The intention is that these files can be freely copied into the source tree of an operating system when porting that OS to run on Xen. Doing so does *not* cause the OS to become subject to the terms of the GPL. All other files in the Xen source distribution are covered by version 2 of the GNU General Public License except where explicitly stated otherwise within individual source files. " Having the libxenvchan.h as Lesser GPL v2.1 where the COPYING file says otherwise is confusing to say at least. Upon consulting with the authors of libxenvchan they said: "FWIW Neither I, nor ITL staff (as author of original libvchan library) have anything against converting it to the BSD-style licence." (Marek Marczykowski-Górecki, http://lists.xen.org/archives/html/xen-devel/2016-06/msg00995.html) so as such lets change it. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Andrew Cooper Acked-by: Anil Madhavapeddy Acked-by: Daniel De Graaf Acked-by: George Dunlap Acked-by: Jan Beulich Acked-by: Jason Andryuk Acked-by: Marek Marczykowski-Górecki Acked-by: Matthew Daley Acked-by: Olaf Hering Acked-by: Roger Pau Monne Acked-by: Ian Jackson ["I have spoken to my line manager. I can confirm that Citrix is happy with this proposed change. So: Acked-by: Ian Jackson This view from Citrix covers all contributions made to these files in the course of Citrix's employees' employment, which I think is: > Cc: Andrew Cooper > cc: George Dunlap > Cc: Ian Campbell > Cc: Ian Jackson > Cc: Roger Pau Monne > Cc: Stefano Stabellini > Cc: Tim Deegan > Cc: Wei Liu .. [in subsequent email]: Wei points out that this ought also to include Keir Fraser's contribution, which was (only) in 2012. " (from Ian's email) In a subsequent mail, Wei also points out that David Scott's contribution is covered by Ian's ack. ] --- diff --git a/xen/include/public/io/libxenvchan.h b/xen/include/public/io/libxenvchan.h index a62869ae8b..44284f437a 100644 --- a/xen/include/public/io/libxenvchan.h +++ b/xen/include/public/io/libxenvchan.h @@ -10,18 +10,23 @@ * * @section LICENSE * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @section DESCRIPTION *